Merge pull request #67 from Spirit-act/master

change apt-key because of deprecation

defaults/main.yml

@@ -28,18 +28,18 @@ rabbitmq_env_config: {}
 
 # rabbitmq_debian_repo: deb http://www.rabbitmq.com/debian/ testing main
 #other repos
-rabbitmq_debian_repo: "deb https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu {{ ansible_distribution_release }} main"
+rabbitmq_debian_repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq-server.asc] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu {{ ansible_distribution_release }} main"
 rabbitmq_debian_repo_key: "https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key"
-rabbitmq_debian_team_key: "0x0A9AF2115F4687BD29803A206B73A36E6026DFCA"
+
 
 rabbitmq_debian_erlang_from_rabbit: true
-rabbitmq_debian_erlang_repo: "deb https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu {{ ansible_distribution_release }} main"
+rabbitmq_debian_erlang_repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq-erlang.asc] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu {{ ansible_distribution_release }} main"
 rabbitmq_debian_erlang_repo_key: "https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key"
 
 
 # current version if not defined
 rabbitmq_debian_version_defined: true
-rabbitmq_debian_version: 3.12.10-1
+rabbitmq_debian_version: 3.13.7-1
 
 # Defines if setting up a rabbitmq cluster
 rabbitmq_enable_clustering: false

tasks/debian.yml

@@ -10,19 +10,11 @@
   register: result
   until: result is successful
 
-- name: debian | adding RabbitMQ repo public GPG key to the apt repo
-  ansible.builtin.apt_key:
+- name: debian | add RabbitMQ repo GPG Signin Keys
+  ansible.builtin.get_url:
     url: "{{ rabbitmq_debian_repo_key }}"
-    state: present
-  become: true
-  register: result
-  until: result is successful
-
-- name: debian | adding RabbitMQ team public GPG key to the apt repo
-  ansible.builtin.apt_key:
-    keyserver: keys.openpgp.org
-    id: "{{ rabbitmq_debian_team_key }}"
-    state: present
+    dest: "/usr/share/keyrings/rabbitmq-server.asc"
+    mode: "0644"
   become: true
   register: result
   until: result is successful
@@ -36,9 +28,10 @@
   until: result is successful
 
 - name: debian | adding RabbitMQ relang repo public GPG key to the apt repo
-  ansible.builtin.apt_key:
+  ansible.builtin.get_url:
     url: "{{ rabbitmq_debian_erlang_repo_key }}"
-    state: present
+    dest: "/usr/share/keyrings/rabbitmq-erlang.asc"
+    mode: "0644"
   become: true
   register: result
   until: result is successful