X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=tasks%2Fdebian.yml;h=0a6572e365909aaf28d3e104de3c0baa20298c68;hb=532687b04b43e3b723f1c063217fd13ca5ae9ee7;hp=4b3878258e14476a9b57fa1e38460b912144f87a;hpb=a290f6cfbff072c146c0873160672baf9059390a;p=github%2Ffretlink%2Fansible-rabbitmq.git

diff --git a/tasks/debian.yml b/tasks/debian.yml
index 4b38782..0a6572e 100644
--- a/tasks/debian.yml
+++ b/tasks/debian.yml
@@ -1,18 +1,64 @@
 ---
+- name: debian | Adding Pre-Reqs
+  apt:
+    name: ['gnupg2']
+    state: present
+  become: true
+  register: result
+  until: result is successful
+
 - name: debian | adding RabbitMQ public GPG key to the apt repo
-  apt_key: url=http://www.rabbitmq.com/rabbitmq-signing-key-public.asc state=present
+  apt_key:
+    url: "{{ rabbitmq_debian_repo_key }}"
+    state: present
+  become: true
+  register: result
+  until: result is successful
 
 - name: debian | adding RabbitMQ repo
-  apt_repository: repo='deb http://www.rabbitmq.com/debian/ testing main' update_cache=no state=present
+  apt_repository:
+    repo: "{{ rabbitmq_debian_repo }}"
+    state: present
+  become: true
+  register: result
+  until: result is successful
+
+- name: debian | add Rabbitmq erlang repo key
+  apt_key:
+    url: https://bintray.com/user/downloadSubjectPublicKey?username=rabbitmq-erlang
+    state: present
+  become: true
+  register: result
+  until: result is successful
+  when: rabbitmq_debian_erlang_from_rabbit
+
+- name: debian | add Rabbitmq erlang repo
+  apt_repository:
+    repo: deb https://dl.bintray.com/rabbitmq-erlang/debian {{ ansible_distribution_release }} erlang
+    state: present
+  become: true
+  when: rabbitmq_debian_erlang_from_rabbit
 
 - name: debian | installing RabbitMQ server
-  apt: name={{ item }} state=present
+  apt:
+    name: ['rabbitmq-server']
+    state: present
+  become: true
+  register: result
+  until: result is successful
   with_items:
-    - rabbitmq-server
+    - rabbitmq-server{{ (rabbitmq_debian_version is defined) | ternary(['=',rabbitmq_debian_version] | join(''),'') }}
 
 - name: debian | enabling the RabbitMQ Management Console
-  rabbitmq_plugin: names=rabbitmq_management state=enabled
+  rabbitmq_plugin:
+    names: rabbitmq_management
+    state: enabled
+  become: true
   notify: restart rabbitmq-server
 
 - name: debian | ensuring that the RabbitMQ service is running
-  service: name=rabbitmq-server state=started enabled=yes
+  service:
+    name: rabbitmq-server
+    state: started
+    enabled: yes
+  become: true