Skip to content

Commit cffcfd9

Browse files
authored
Merge pull request #37 from mbocquet/apt_key_deprecated
add variables. apt_key is deprecated
2 parents a3dbd62 + fd691d3 commit cffcfd9

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

defaults/main.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
---
22

3+
postgresql_apt_keys_dir: "/etc/apt/keyrings"
4+
postgresql_pgdg_key_dest: "{{ postgresql_apt_keys_dir }}/pgdg.asc"
5+
postgresql_pgdg_key_url: "https://www.postgresql.org/media/keys/ACCC4CF8.asc"
6+
postgresql_pgdg_repo: "deb [signed-by={{ postgresql_pgdg_key_dest }}] http://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
7+
38
postgresql_default_version: 10
49
postgresql_user_name: postgres
510

tasks/debian.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
---
22

3+
- name: APT keyrings directory
4+
file:
5+
path: "{{ postgresql_apt_keys_dir }}"
6+
state: directory
7+
mode: 0755
8+
39
- name: Install pgdg package signing key (Debian/pgdg)
4-
apt_key:
5-
url: https://www.postgresql.org/media/keys/ACCC4CF8.asc
6-
id: ACCC4CF8
10+
get_url:
11+
url: "{{ postgresql_pgdg_key_url }}"
12+
dest: "{{ postgresql_pgdg_key_dest }}"
713
register: __postgresql_apt_key_result
814
until: __postgresql_apt_key_result is succeeded
915
retries: 5
@@ -12,7 +18,7 @@
1218

1319
- name: Install pgdg repository (Debian/pgdg)
1420
apt_repository:
15-
repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
21+
repo: "{{ postgresql_pgdg_repo }}"
1622
update_cache: true
1723
when: postgresql_flavor is defined and postgresql_flavor == "pgdg"
1824

0 commit comments

Comments
 (0)